From c7bd2ad1c9a65fbeac79ae6cb3c56fb3291ffd6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 5 Aug 2010 10:10:45 -0400 Subject: [PATCH] gdk: Remove picture pointer from X11 drawable It's not used anymore --- gdk/x11/gdkdisplay-x11.h | 3 --- gdk/x11/gdkdrawable-x11.c | 7 ------- gdk/x11/gdkdrawable-x11.h | 2 -- 3 files changed, 12 deletions(-) diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h index 697632b746..86beda5b00 100644 --- a/gdk/x11/gdkdisplay-x11.h +++ b/gdk/x11/gdkdisplay-x11.h @@ -147,9 +147,6 @@ struct _GdkDisplayX11 guint have_input_shapes : 1; gint shape_event_base; - /* Alpha mask picture format */ - XRenderPictFormat *mask_format; - /* The offscreen window that has the pointer in it (if any) */ GdkWindow *active_offscreen_window; }; diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 8fba6eb23c..9204745918 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -107,13 +107,6 @@ _gdk_x11_drawable_finish (GdkDrawable *drawable) { GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable); - if (impl->picture) - { - XRenderFreePicture (GDK_SCREEN_XDISPLAY (impl->screen), - impl->picture); - impl->picture = None; - } - if (impl->cairo_surface) { cairo_surface_finish (impl->cairo_surface); diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h index 2b885366f0..4d387c1aca 100644 --- a/gdk/x11/gdkdrawable-x11.h +++ b/gdk/x11/gdkdrawable-x11.h @@ -32,7 +32,6 @@ #include #include -#include G_BEGIN_DECLS @@ -68,7 +67,6 @@ struct _GdkDrawableImplX11 Window xid; GdkScreen *screen; - Picture picture; cairo_surface_t *cairo_surface; }; -- 2.30.2